From 5de669daa2972aae824e692103345378de4a4ea8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 19 Sep 2018 09:54:50 +0100 Subject: [PATCH] Use the same xvfb-run screen configuration as upstream --- debian/rules | 2 +- debian/tests/build | 2 +- debian/tests/installed-tests | 2 +- debian/tests/python3-gi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 4b9c21a3ad..50bda632dc 100755 --- a/debian/rules +++ b/debian/rules @@ -177,7 +177,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) glib-compile-schemas debian/build/glib-2.0/schemas/ # Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail env -u LD_PRELOAD \ - xvfb-run -a -s "-screen 0 640x480x16" \ + xvfb-run -a -s "-screen 0 1024x768x24" \ dh_auto_test --builddirectory=debian/build/deb -- -k 0 -j 1 || true endif diff --git a/debian/tests/build b/debian/tests/build index f79d2df2dc..cd7725b405 100755 --- a/debian/tests/build +++ b/debian/tests/build @@ -54,6 +54,6 @@ EOF gcc -o gtktest gtktest.c `pkg-config --cflags --libs gtk+-4.0` echo "build: OK" [ -x gtktest ] -xvfb-run -a -s "-screen 0 640x480x16" \ +xvfb-run -a -s "-screen 0 1024x768x24" \ ./gtktest echo "run: OK" diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests index ae7bf6c250..c6aa30bbdf 100755 --- a/debian/tests/installed-tests +++ b/debian/tests/installed-tests @@ -12,7 +12,7 @@ export GIO_USE_VOLUME_MONITOR=unix export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP" exec dbus-run-session -- \ -xvfb-run -a -s "-screen 0 640x480x16" \ +xvfb-run -a -s "-screen 0 1024x768x24" \ gnome-desktop-testing-runner \ --report-directory="$AUTOPKGTEST_ARTIFACTS" \ --tap \ diff --git a/debian/tests/python3-gi b/debian/tests/python3-gi index 26cf10bd2d..2c2c4d2769 100644 --- a/debian/tests/python3-gi +++ b/debian/tests/python3-gi @@ -1,6 +1,6 @@ #!/bin/sh -xvfb-run -a -s "-screen 0 640x480x16" \ +xvfb-run -a -s "-screen 0 1024x768x24" \ python3 <